merge emacs-23
authorKenichi Handa <handa@m17n.org>
Thu, 17 Feb 2011 00:43:54 +0000 (09:43 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 17 Feb 2011 00:43:54 +0000 (09:43 +0900)

Trivial merge